From 9f124d83346982f9d274c5cdf05185dc65436115 Mon Sep 17 00:00:00 2001 From: "kaf24@firebug.cl.cam.ac.uk" Date: Wed, 10 May 2006 16:47:00 +0100 Subject: [PATCH] Simply do not declare module_exit() handlers for netback/blkback, rather than declaring the modules unsafe. Signed-off-by: Keir Fraser --- linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c | 9 +-------- linux-2.6-xen-sparse/drivers/xen/netback/netback.c | 8 -------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c index 48be015532..ae240a601f 100644 --- a/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c +++ b/linux-2.6-xen-sparse/drivers/xen/blkback/blkback.c @@ -571,19 +571,12 @@ static int __init blkif_init(void) list_add_tail(&pending_reqs[i].free_list, &pending_free); blkif_xenbus_init(); - __unsafe(THIS_MODULE); + return 0; } module_init(blkif_init); -static void blkif_exit(void) -{ - BUG(); -} - -module_exit(blkif_exit); - MODULE_LICENSE("Dual BSD/GPL"); /* diff --git a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c index b5d3107951..60628ea9b4 100644 --- a/linux-2.6-xen-sparse/drivers/xen/netback/netback.c +++ b/linux-2.6-xen-sparse/drivers/xen/netback/netback.c @@ -849,18 +849,10 @@ static int __init netback_init(void) &netif_be_dbg); #endif - __unsafe(THIS_MODULE); - return 0; } -static void netback_cleanup(void) -{ - BUG(); -} - module_init(netback_init); -module_exit(netback_cleanup); MODULE_LICENSE("Dual BSD/GPL"); -- 2.30.2